[5.3] Upmerge changes from 5.2-dev 2024-11-11 by richard67 · Pull Request #44434 · joomla/joomla-cms

richard67 · 2024-11-11T10:19:17Z

Pull Request for Issue # .

Summary of Changes

This pull request (PR) merges the changes from 5.2-dev up into 5.3-dev which have been made since the last upmerge with PR #44367 , which includes the file permissions (mode) changes in the git index of the repository from commit 9b13ba2 .

In addition this PR fixes the javascript-cs step failing in Drone due to a missing trailing comma in file tests/System/plugins/fs.mjs . In the 5.2-dev branch the linter doesn't complain about that, but here it does. I have created PR #44435 for the 5.2-dev branch to fix it there, too, and will later handle the conflict when doing the next upmerge for 5.3-dev.

Testing Instructions

Review. Check the commits of this PR and those in the 5.2-dev branch, and check the code changes and the file permissions (mode) changes in this PR.

Link to documentations

Please select:

Documentation link for docs.joomla.org:
No documentation changes for docs.joomla.org needed
Pull Request link for manual.joomla.org:
No documentation changes for manual.joomla.org needed

* cy.scheduler5 * cs * eol * 5 * Delete 0composer.lock * five * del

* [5.2] add test for site router (sef) * use copyFileSync

Fix joomla#44377

… page (joomla#44375)

…oomla#44392)

…-24.sql (joomla#44388)

joomla#44209)

* 500 * cs * cs * cs * cs * cs sucks * bare minimum * cs

* Fix dark color scheme link color * Fix missing curly brace * Add missing hover color * Added phpcs:disable Side Effects to prevent drone warning * Disable drone on the function * Remove drone comments * Move function to fix drone errors * again drone issues * Made sugested changes to get drone to behave * Convert indentation from tabs to spaces

* Update UpdateModel.php * Update com_installer.ini * Update UpdateModel.php * Update administrator/components/com_installer/src/Model/UpdateModel.php Co-authored-by: Quy <quy@nomonkeybiz.com> * Update com_installer.ini * Update administrator/language/en-GB/com_installer.ini * Update administrator/language/en-GB/com_installer.ini * Update administrator/components/com_installer/src/Model/UpdateModel.php * Update administrator/components/com_installer/src/Model/UpdateModel.php

…oomla#44327) * Remove unused css * Modified container query

Co-authored-by: David Jardin <d.jardin@djumla.de>

…#44426)

…4422) Co-authored-by: Quy <quy@nomonkeybiz.com>

…s not a function (joomla#44306)

… from 5.2.0 or 5.2.1 (joomla#44379)

richard67 · 2024-11-11T12:54:30Z

Changing to draft as the system tests are failing for this PR:

1) Test in frontend that the contact site router
       can process contact without a menu item:

      AssertionError: expected 200 to equal 301
      + expected - actual

      -200
      +301

      at  (webpack://joomla/./tests/System/integration/site/components/com_contact/Router.cy.js:5:35

It seems that the new system tests added to the 5.2-dev branch with PR #44253 need to be adapted to changes in the 5.3-dev branch.

…2024-11-11

This reverts commit 4b05477.

richard67 · 2024-11-11T15:30:57Z

I was able to fix the failing system test by changing the expected result, but I don't know if that is the right change. Will leave this PR in draft mode until clarified.

LadySolveig · 2024-11-13T13:44:07Z

Thank you @richard67

alikon and others added 28 commits October 29, 2024 13:45

[cypress] + com_scheduler (joomla#44239)

59dbd1a

* cy.scheduler5 * cs * eol * 5 * Delete 0composer.lock * five * del

[5.2] add test for site router (sef) (joomla#44253)

0662f56

* [5.2] add test for site router (sef) * use copyFileSync

URL in email broken with Mail Template Layout (joomla#44378)

69e2e1f

Fix joomla#44377

[Guided Tours] Fix blank screen after a session time out on the steps…

c9057e1

… page (joomla#44375)

Avoid strlen for admin submenu items (joomla#43884)

e3cc332

[5.2] fix for Error with trashing items when items are checked out (j…

c0539b1

…oomla#44392)

[5.2] Rename update SQL scripts 5.2.0-2024-09-24.sql to 5.2.1-2024-09…

6808902

…-24.sql (joomla#44388)

[5.2.] Fix Dark mode in user-captive view - Fix for Issue joomla#43448 (

31640ec

joomla#44209)

[5.2] Allow relative URLs in wrapper module and component (joomla#44314)

7e6ac90

[5.2] fix for undefined property: $module (joomla#44280)

94bd619

SEF URLs: Check if SEF plugin is published (joomla#44283)

cc82bbe

[5][cypress] mod_articles (joomla#44393)

50a859b

* 500 * cs * cs * cs * cs * cs sucks * bare minimum * cs

Changing file permissions

9b13ba2

Joomla! 5.2.1

ba684a4

[5.2] Articles Module: Remove unused css + modified container query (j…

d7bc6e9

…oomla#44327) * Remove unused css * Modified container query

Fix JS errors in admin menu (joomla#44410)

a79ec96

Revert to dev

8eddd25

Merge branch '5.2-dev' of github.com:joomla/joomla-cms into 5.2-dev

f8688d6

Update debug.es6.js (joomla#44342)

773f7d4

Co-authored-by: David Jardin <d.jardin@djumla.de>

Smart Search: Fix URL with highlight query (joomla#43398)

7802043

Merge branch '5.2-dev' of github.com:joomla/joomla-cms into 5.2-dev

30a64b3

[5.2] Add required content filters for the administrator menu (joomla…

ce8b38b

…#44426)

Add missing html elements to sanitizer for finder debugging (joomla#4…

73b5d03

…4422) Co-authored-by: Quy <quy@nomonkeybiz.com>

[5.2] Fix reCAPTCHA Invisble error getElementsByClassName().forEach i…

97fcd9d

…s not a function (joomla#44306)

[5.2] Fix wrong core files and core folders permissions 777 on update…

63305a4

… from 5.2.0 or 5.2.1 (joomla#44379)

Merge branch '5.2-dev' into 5.3-dev-upmerge-2024-11-11

dc71a36

richard67 requested a review from chmst as a code owner November 11, 2024 10:19

joomla-cms-bot added the Language Change This is for Translators label Nov 11, 2024

joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.3-dev labels Nov 11, 2024

richard67 removed the request for review from chmst November 11, 2024 10:22

Fix JS CS missing trailing comma

f37d1a2

richard67 mentioned this pull request Nov 11, 2024

[5.2] Fix JS CS missing trailing comma #44435

Merged

4 tasks

Update phpstan to 2.0 (joomla#44436)

34bdb13

richard67 marked this pull request as draft November 11, 2024 12:45

richard67 and others added 5 commits November 11, 2024 14:53

Fix JS CS missing trailing comma (joomla#44435)

04daa28

Merge remote-tracking branch 'upstream/5.2-dev' into 5.3-dev-upmerge-…

2b0cfcc

…2024-11-11

Adapt system test to 5.3

4b05477

Revert "Adapt system test to 5.3"

81f5d6c

This reverts commit 4b05477.

Adapt system test to 5.3 2nd trial

4f2a09e

richard67 marked this pull request as ready for review November 13, 2024 12:52

Merge branch '5.3-dev' into 5.3-dev-upmerge-2024-11-11

b686fb9

LadySolveig merged commit 8fe577e into joomla:5.3-dev Nov 13, 2024

LadySolveig added this to the Joomla! 5.3.0 milestone Nov 13, 2024

richard67 deleted the 5.3-dev-upmerge-2024-11-11 branch November 13, 2024 14:53

jgerman-bot mentioned this pull request Nov 14, 2024

[5.3] Upmerge changes from 5.2-dev 2024-11-11 joomlagerman/joomla#3343

Closed

joomlapl-bot mentioned this pull request Nov 14, 2024

[5.3] Upmerge changes from 5.2-dev 2024-11-11 JoomlaPolska/jezyk-J4#608

Closed

mahmoudmagdy1-1 mentioned this pull request Jul 16, 2025

[6.0] Add Support for Github Codespaces #45719

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[5.3] Upmerge changes from 5.2-dev 2024-11-11#44434

[5.3] Upmerge changes from 5.2-dev 2024-11-11#44434
LadySolveig merged 36 commits intojoomla:5.3-devfrom
richard67:5.3-dev-upmerge-2024-11-11

richard67 commented Nov 11, 2024 •

edited

Loading

Uh oh!

richard67 commented Nov 11, 2024

Uh oh!

richard67 commented Nov 11, 2024

Uh oh!

LadySolveig commented Nov 13, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

Uh oh!

Conversation

richard67 commented Nov 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of Changes

Testing Instructions

Link to documentations

Uh oh!

richard67 commented Nov 11, 2024

Uh oh!

richard67 commented Nov 11, 2024

Uh oh!

LadySolveig commented Nov 13, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

richard67 commented Nov 11, 2024 •

edited

Loading